From: Jan Beulich Date: Fri, 31 Jan 2020 15:48:25 +0000 (+0100) Subject: x86/HVM: avoid truncation of PM timer I/O port range version X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~773 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=4be325e5d4106b9447586cd19dd92a4a78b49598;p=xen.git x86/HVM: avoid truncation of PM timer I/O port range version Don't silently ignore the upper 32 bits. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu Acked-by: Andrew Cooper --- diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 21ebb93331..97b9e41712 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -313,9 +313,9 @@ static int acpi_load(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(PMTIMER, acpi_save, acpi_load, 1, HVMSR_PER_DOM); -int pmtimer_change_ioport(struct domain *d, unsigned int version) +int pmtimer_change_ioport(struct domain *d, uint64_t version) { - unsigned int old_version; + uint64_t old_version; if ( !has_vpm(d) ) return -ENODEV; diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 99169dd625..3fc78f8f49 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -188,7 +188,7 @@ void rtc_update_clock(struct domain *d); void pmtimer_init(struct vcpu *v); void pmtimer_deinit(struct domain *d); void pmtimer_reset(struct domain *d); -int pmtimer_change_ioport(struct domain *d, unsigned int version); +int pmtimer_change_ioport(struct domain *d, uint64_t version); void hpet_init(struct domain *d); void hpet_deinit(struct domain *d);